Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 5 Mar 2010 15:28:17 +0000 (15:28 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 5 Mar 2010 15:28:17 +0000 (15:28 +0000)

Trivial merge